bitkeeper revision 1.1159.1.438 (419cebe4keq2PnRNY9NpGUPu_tQZJw)

sched.h, asm-offsets.c, traps.c:
  Fix fallout from sync w/ head.

diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index 149fe50f3a2454ed37df4d31352a9bc40f1c33e9..dce0b7d736566fc95e9e30cc4888b5b1d1744ee9 100644 (file)
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -464,7 +464,7 @@ asmlinkage void do_general_protection(struct xen_regs *regs, long error_code)
 {
     struct exec_domain *ed = current;
     struct domain *d = ed->domain;
-    struct trap_bounce *tb = &d->thread.trap_bounce;
+    struct trap_bounce *tb = &ed->thread.trap_bounce;
     trap_info_t *ti;
     unsigned long fixup;
 
@@ -616,7 +616,7 @@ asmlinkage void do_debug(struct xen_regs *regs, long error_code)
 {
     unsigned int condition;
     struct exec_domain *d = current;
-    struct trap_bounce *tb = &ed->thread.trap_bounce;
+    struct trap_bounce *tb = &d->thread.trap_bounce;
 
     DEBUGGER_trap_entry(TRAP_debug, regs, error_code);
 

diff --git a/xen/arch/x86/x86_32/asm-offsets.c b/xen/arch/x86/x86_32/asm-offsets.c
index a9768854eac99d54a945d1e8f7ffb336ca14da4b..afb12ea6aa4bca5434ce1068cd57f0d54d25049b 100644 (file)
--- a/xen/arch/x86/x86_32/asm-offsets.c
+++ b/xen/arch/x86/x86_32/asm-offsets.c
@@ -34,19 +34,17 @@ void __dummy__(void)
     OFFSET(XREGS_orig_eax, struct xen_regs, orig_eax);
     BLANK();
 
-    OFFSET(DOMAIN_processor, struct domain, processor);
-    OFFSET(DOMAIN_shared_info, struct domain, shared_info);
-    OFFSET(DOMAIN_event_sel, struct domain, thread.event_selector);
-    OFFSET(DOMAIN_event_addr, struct domain, thread.event_address);
-    OFFSET(DOMAIN_failsafe_sel, struct domain, thread.failsafe_selector);
-    OFFSET(DOMAIN_failsafe_addr, struct domain, thread.failsafe_address);
-    OFFSET(DOMAIN_trap_bounce, struct domain, thread.trap_bounce);
+    OFFSET(EDOMAIN_processor, struct exec_domain, processor);
+    OFFSET(EDOMAIN_vcpu_info, struct exec_domain, vcpu_info);
+    OFFSET(EDOMAIN_event_sel, struct exec_domain, thread.event_selector);
+    OFFSET(EDOMAIN_event_addr, struct exec_domain, thread.event_address);
+    OFFSET(EDOMAIN_failsafe_sel, struct exec_domain, thread.failsafe_selector);
+    OFFSET(EDOMAIN_failsafe_addr, struct exec_domain, thread.failsafe_address);
+    OFFSET(EDOMAIN_trap_bounce, struct exec_domain, thread.trap_bounce);
     BLANK();
 
-    OFFSET(SHINFO_upcall_pending, shared_info_t, 
-           vcpu_data[0].evtchn_upcall_pending);
-    OFFSET(SHINFO_upcall_mask, shared_info_t, 
-           vcpu_data[0].evtchn_upcall_mask);
+    OFFSET(VCPUINFO_upcall_pending, vcpu_info_t, evtchn_upcall_pending);
+    OFFSET(VCPUINFO_upcall_mask, vcpu_info_t, evtchn_upcall_mask);
     BLANK();
 
     OFFSET(TRAPBOUNCE_error_code, struct trap_bounce, error_code);

diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
index 6bece37490a63d51ff1c998e6610fb211e4c5a3e..25309b408a1b2f5683c865f763589d655ce544a9 100644 (file)
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -59,7 +59,7 @@ struct exec_domain
 {
     u32 processor;
 
-    shared_info_t *shared_info;
+    vcpu_info_t *vcpu_info;
 
     struct domain *domain;
     struct exec_domain *ed_next_list;